Skip to content

filebeat,libbeat,x-pack/filebeat: clean up state store types#43063

Merged
efd6 merged 2 commits intoelastic:mainfrom
efd6:st7819-statestore_gardening
Mar 19, 2025
Merged

filebeat,libbeat,x-pack/filebeat: clean up state store types#43063
efd6 merged 2 commits intoelastic:mainfrom
efd6:st7819-statestore_gardening

Conversation

@efd6
Copy link
Contributor

@efd6 efd6 commented Mar 6, 2025 •
edited
Loading

Proposed commit message

filebeat,libbeat,x-pack/filebeat: clean up state store types

This centralises the state store to simplify and clarify the use of persistent
stores.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

@efd6 efd6 added enhancement Filebeat Filebeat libbeat Team:Security-Service Integrations Security Service Integrations Team backport-8.x Automated backport to the 8.x branch with mergify backport-active-9 Automated backport with mergify to all the active 9.[0-9]+ branches labels Mar 6, 2025
@efd6 efd6 self-assigned this Mar 6, 2025
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Mar 6, 2025
@efd6 efd6 force-pushed the st7819-statestore_gardening branch 3 times, most recently from cf6742d to ce38f10 Compare March 6, 2025 08:04
@efd6
Copy link
Contributor Author

efd6 commented Mar 6, 2025

/test

@efd6 efd6 force-pushed the st7819-statestore_gardening branch from ce38f10 to 0d96623 Compare March 6, 2025 20:30
@efd6
Copy link
Contributor Author

efd6 commented Mar 7, 2025

/test

@efd6 efd6 force-pushed the st7819-statestore_gardening branch 2 times, most recently from 2633073 to 403b3ad Compare March 10, 2025 07:57
@efd6
filebeat,libbeat,x-pack/filebeat: clean up state store types
a09c2b9 
This centralises the state store to simplify and clarify the use of persistent
stores.
@efd6 efd6 force-pushed the st7819-statestore_gardening branch from 403b3ad to a09c2b9 Compare March 11, 2025 20:57
@efd6 efd6 marked this pull request as ready for review March 11, 2025 23:04
@efd6 efd6 requested review from a team as code owners March 11, 2025 23:04
@efd6 efd6 requested review from khushijain21 and leehinman March 11, 2025 23:04
@elasticmachine
Copy link
Contributor

elasticmachine commented Mar 11, 2025

Pinging @elastic/security-service-integrations (Team:Security-Service Integrations)

leehinman
leehinman reviewed Mar 17, 2025
View reviewed changes
Copy link
Contributor

@leehinman leehinman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM except for the linter.

@efd6
Copy link
Contributor Author

efd6 commented Mar 17, 2025 •
edited
Loading

@leehinman All the linter errors are due to incorrect use of the linter and how that breaks it. None can be fixed in this PR. Issue #39589

@efd6 efd6 added Team:obs-ds-hosted-services Label for the Observability Hosted Services team Team:Obs-InfraObs Label for the Observability Infrastructure Monitoring team Team:Security-Windows Platform Windows Platform Team in Security Solution labels Mar 18, 2025
@elasticmachine
Copy link
Contributor

elasticmachine commented Mar 18, 2025

Pinging @elastic/obs-ds-hosted-services (Team:obs-ds-hosted-services)

@elasticmachine
Copy link
Contributor

elasticmachine commented Mar 18, 2025

Pinging @elastic/sec-windows-platform (Team:Security-Windows Platform)

andrewkroh
andrewkroh approved these changes Mar 18, 2025
View reviewed changes
filebeat/beater/store.go Outdated

// Access returns the storage registry depending on the type. Default is the file store.
func (s *filebeatStore) Access(typ string) (*statestore.Store, error) {
// AccessType returns the storage registry depending on the type. Default is the file store.
Copy link
Member

@andrewkroh andrewkroh Mar 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/AccessType/StoreFor/

Copy link
Contributor Author

@efd6 efd6 Mar 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

tommyers-elastic
tommyers-elastic reviewed Mar 19, 2025
View reviewed changes
tommyers-elastic
tommyers-elastic approved these changes Mar 19, 2025
View reviewed changes
Copy link
Contributor

@tommyers-elastic tommyers-elastic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@efd6 efd6 merged commit df62e10 into elastic:main Mar 19, 2025
188 of 191 checks passed
mergify bot pushed a commit that referenced this pull request Mar 19, 2025
@efd6 @mergify
filebeat,libbeat,x-pack/filebeat: clean up state store types (#43063)
f3548c4 
This centralises the state store to simplify and clarify the use of persistent
stores.

(cherry picked from commit df62e10)

# Conflicts:
#	filebeat/beater/filebeat.go
#	filebeat/input/journald/environment_test.go
mergify bot pushed a commit that referenced this pull request Mar 19, 2025
@efd6 @mergify
filebeat,libbeat,x-pack/filebeat: clean up state store types (#43063)
7369cf7 
This centralises the state store to simplify and clarify the use of persistent
stores.

(cherry picked from commit df62e10)
This was referenced Mar 19, 2025
Merged
Merged
efd6 added a commit that referenced this pull request Mar 19, 2025
@mergify @efd6
filebeat,libbeat,x-pack/filebeat: clean up state store types (#43063) (…
c282cfb 
…#43365)

This centralises the state store to simplify and clarify the use of persistent
stores.

(cherry picked from commit df62e10)

Co-authored-by: Dan Kortschak <dan.kortschak@elastic.co>
efd6 added a commit that referenced this pull request Mar 19, 2025
@mergify @efd6
[9.0](backport #43063) filebeat,libbeat,x-pack/filebeat: clean up sta…
241531f 
…te store types (#43366)

* filebeat,libbeat,x-pack/filebeat: clean up state store types (#43063)

This centralises the state store to simplify and clarify the use of persistent
stores.

(cherry picked from commit df62e10)

# Conflicts:
#	filebeat/beater/filebeat.go
#	filebeat/input/journald/environment_test.go

* fix conflicts

---------

Co-authored-by: Dan Kortschak <dan.kortschak@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@andrewkroh andrewkroh andrewkroh approved these changes

@Kavindu-Dodan Kavindu-Dodan Kavindu-Dodan approved these changes

@leehinman leehinman leehinman approved these changes

@tommyers-elastic tommyers-elastic tommyers-elastic approved these changes

@khushijain21 khushijain21 Awaiting requested review from khushijain21 khushijain21 is a code owner automatically assigned from elastic/elastic-agent-data-plane

Assignees

@efd6 efd6

Labels

backport-8.x Automated backport to the 8.x branch with mergify backport-active-9 Automated backport with mergify to all the active 9.[0-9]+ branches enhancement Filebeat Filebeat libbeat Team:obs-ds-hosted-services Label for the Observability Hosted Services team Team:Obs-InfraObs Label for the Observability Infrastructure Monitoring team Team:Security-Service Integrations Security Service Integrations Team Team:Security-Windows Platform Windows Platform Team in Security Solution

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@efd6 @elasticmachine @andrewkroh @Kavindu-Dodan @leehinman @tommyers-elastic

Comments